From f53513b012968240ba490efe873982d213a85d46 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 27 Dec 2007 23:01:50 +0000 Subject: [PATCH] hvm: copy_{to,from}_user_hvm shoudl return appropriate error codes. Signed-off-by: Keir Fraser --- xen/arch/x86/hvm/platform.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/platform.c b/xen/arch/x86/hvm/platform.c index 273a2ed08a..e6ea6d9b99 100644 --- a/xen/arch/x86/hvm/platform.c +++ b/xen/arch/x86/hvm/platform.c @@ -1310,26 +1310,30 @@ DEFINE_PER_CPU(int, guest_handles_in_xen_space); deal with this. */ unsigned long copy_to_user_hvm(void *to, const void *from, unsigned len) { + int rc; + if ( this_cpu(guest_handles_in_xen_space) ) { memcpy(to, from, len); return 0; } - return hvm_copy_to_guest_virt_nofault( - (unsigned long)to, (void *)from, len); + rc = hvm_copy_to_guest_virt_nofault((unsigned long)to, (void *)from, len); + return rc ? len : 0; /* fake a copy_to_user() return code */ } unsigned long copy_from_user_hvm(void *to, const void *from, unsigned len) { + int rc; + if ( this_cpu(guest_handles_in_xen_space) ) { memcpy(to, from, len); return 0; } - return hvm_copy_from_guest_virt_nofault( - to, (unsigned long)from, len); + rc = hvm_copy_from_guest_virt_nofault(to, (unsigned long)from, len); + return rc ? len : 0; /* fake a copy_from_user() return code */ } /* -- 2.30.2